Auto merge of #1922 - Gankro:css, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 20 Aug 2015 04:22:28 +0000 (04:22 +0000)
committerbors <bors@rust-lang.org>
Thu, 20 Aug 2015 04:22:28 +0000 (04:22 +0000)

Trivial merge